From: Keir Fraser Date: Wed, 26 Sep 2007 08:10:41 +0000 (+0100) Subject: firmware: fix romimage generation for *bsd X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14937^2~21 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=f3f2e4ef696abbdd43b291389c4f6d3eee688768;p=xen.git firmware: fix romimage generation for *bsd - portability fix in Makefile: mkhex is not bash specific - GNU od separates column with one blank, BSD od uses eight blanks. Change sed to deal with this. - Add a fourth sed to fix a build error on NetBSD Signed-off-by: Christoph Egger --- diff --git a/tools/firmware/hvmloader/mkhex b/tools/firmware/hvmloader/mkhex index 7389d70483..4517e36c53 100755 --- a/tools/firmware/hvmloader/mkhex +++ b/tools/firmware/hvmloader/mkhex @@ -21,6 +21,6 @@ # echo "unsigned $1[] = {" -od -v -t x $2 | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$/,/' +od -v -t x $2 | sed 's/^[0-9]* */0x/' | sed 's/ */, 0x/g' | sed 's/$/,/' | sed 's/0x,//' | sed 's/^[0-9]*,//' echo "};" diff --git a/tools/firmware/rombios/32bit/Makefile b/tools/firmware/rombios/32bit/Makefile index 1cd7100ae9..0a17154a43 100644 --- a/tools/firmware/rombios/32bit/Makefile +++ b/tools/firmware/rombios/32bit/Makefile @@ -39,4 +39,4 @@ $(TARGET): subdirs 32bitbios.o util.o nm -u 32bitbios_all.o; \ exit 11; \ } || : - bash mkhex highbios_array 32bitbios_all.o > $@ + sh mkhex highbios_array 32bitbios_all.o > $@ diff --git a/tools/firmware/rombios/32bit/mkhex b/tools/firmware/rombios/32bit/mkhex index 7389d70483..4517e36c53 100644 --- a/tools/firmware/rombios/32bit/mkhex +++ b/tools/firmware/rombios/32bit/mkhex @@ -21,6 +21,6 @@ # echo "unsigned $1[] = {" -od -v -t x $2 | sed 's/^[0-9]* /0x/' | sed 's/ /, 0x/g' | sed 's/$/,/' +od -v -t x $2 | sed 's/^[0-9]* */0x/' | sed 's/ */, 0x/g' | sed 's/$/,/' | sed 's/0x,//' | sed 's/^[0-9]*,//' echo "};"